Juggling libglnx.h includes

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 776f55101c079a936a2d9fe85f9f70f05ac95c97..85fbb44ca338ba702524bf49130656eee5a95e30 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -25,7 +25,7 @@ libostree_kernel_args_la_SOURCES = \
        src/libostree/ostree-kernel-args.h \
        src/libostree/ostree-kernel-args.c \
        $(NULL)
-libostree_kernel_args_la_CFLAGS = $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+libostree_kernel_args_la_CFLAGS = -I$(srcdir)/libglnx $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 libostree_kernel_args_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS)
 
 lib_LTLIBRARIES += libostree-1.la

diff --git a/src/libostree/ostree-deployment.c b/src/libostree/ostree-deployment.c
index 0f98c59807da5595fe2eea79f38e1cb7aafac76a..c204f43d57ebfabcdbae21b54d9cd7623cd5cbd4 100644 (file)
--- a/src/libostree/ostree-deployment.c
+++ b/src/libostree/ostree-deployment.c
@@ -22,6 +22,7 @@
 
 #include "ostree-deployment.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 struct _OstreeDeployment
 {

diff --git a/src/libostree/ostree-kernel-args.c b/src/libostree/ostree-kernel-args.c
index 524b9cdd3faf09be8bd2423411e5f06c29d8b676..e4dfec060f6b10f6ce46a9017f1e38e6171615e4 100644 (file)
--- a/src/libostree/ostree-kernel-args.c
+++ b/src/libostree/ostree-kernel-args.c
@@ -22,6 +22,7 @@
 
 #include "ostree-kernel-args.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include <string.h>
 

diff --git a/src/libostree/ostree-rollsum.c b/src/libostree/ostree-rollsum.c
index 5a57e1c370a5401a799bf91e4e5ca55cf5fca312..c6f08766c4338f311309753802bbffe77a385b62 100644 (file)
--- a/src/libostree/ostree-rollsum.c
+++ b/src/libostree/ostree-rollsum.c
@@ -25,6 +25,7 @@
 
 #include "ostree-rollsum.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "bupsplit.h"
 
 #define ROLLSUM_BLOB_MAX (8192*4)

diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 5fc027fe319793d27bd73175f0de5bdaf9f74383..608b9ef1d0be1456435a420898104592bbecb6b5 100644 (file)
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "ot-main.h"
 #include "ot-builtins.h"
 #include "ot-remote-builtins.h"

diff --git a/src/ostree/ot-editor.c b/src/ostree/ot-editor.c
index 4a7a90b1e399607fa226039ffeea762ed9a2c858..05fbe1f1c5f431321fa73111bfdcfae0b7d5a76c 100644 (file)
--- a/src/ostree/ot-editor.c
+++ b/src/ostree/ot-editor.c
@@ -24,6 +24,7 @@
 
 #include "ot-editor.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include <sys/wait.h>
 #include <string.h>

diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 47ea36cb7decbfdca027a2ccd7a449715873399d..0a75beeee82e6fcdc40cc7df2c6b571dffca3fbd 100644 (file)
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libglnx.h>
-
 #include "ostree.h"
 #include "ot-main.h"
 #include "otutil.h"

diff --git a/src/ostree/ot-main.h b/src/ostree/ot-main.h
index 60ddb36ac4162c4e1812878123281e4625a64e27..4dd6f4191322da810cc8419594e93536fb6a841f 100644 (file)
--- a/src/ostree/ot-main.h
+++ b/src/ostree/ot-main.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "ostree.h"
+#include "libglnx.h"
 
 typedef enum {
   OSTREE_BUILTIN_FLAG_NONE = 0,

diff --git a/src/ostree/ot-remote-builtin-add.c b/src/ostree/ot-remote-builtin-add.c
index 99e47e7c2fd8feb86218a84fbb7a886e4016e435..f6dbe53d8408fad34c4293ce241f24c10b582b0f 100644 (file)
--- a/src/ostree/ot-remote-builtin-add.c
+++ b/src/ostree/ot-remote-builtin-add.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "otutil.h"
 #include "ot-tool-util.h"
 

diff --git a/src/ostree/ot-remote-builtin-delete.c b/src/ostree/ot-remote-builtin-delete.c
index d8d16db8777d03ad7736e225cb290a3c724f7037..caa5cf8f041bdef6a7cf504a27e2485ea87e9692 100644 (file)
--- a/src/ostree/ot-remote-builtin-delete.c
+++ b/src/ostree/ot-remote-builtin-delete.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "otutil.h"
 
 #include "ot-main.h"

diff --git a/src/ostree/ot-remote-builtin-list.c b/src/ostree/ot-remote-builtin-list.c
index 8e4c3d1ded3f31249bd3bf0236f4e1276d1df54b..c42c44ba3a5b37df579bc430c23fa79da8e98e64 100644 (file)
--- a/src/ostree/ot-remote-builtin-list.c
+++ b/src/ostree/ot-remote-builtin-list.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "ot-main.h"
 #include "ot-remote-builtins.h"
 

diff --git a/src/ostree/ot-remote-builtin-show-url.c b/src/ostree/ot-remote-builtin-show-url.c
index dea8efc308fcc43a73f29e7328121eddf08ec240..a4b447c87be42daa18a91f1309aac2d6d324acde 100644 (file)
--- a/src/ostree/ot-remote-builtin-show-url.c
+++ b/src/ostree/ot-remote-builtin-show-url.c
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <libglnx.h>
-
 #include "otutil.h"
 
 #include "ot-main.h"

diff --git a/tests/test-bsdiff.c b/tests/test-bsdiff.c
index 17155321e38cc8d46ffd791c11d37760f43f2eb4..1769cb9c0c400edfb5597012e8adc9c6006eec95 100644 (file)
--- a/tests/test-bsdiff.c
+++ b/tests/test-bsdiff.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "bsdiff/bsdiff.h"
 #include "bsdiff/bspatch.h"
 #include <glib.h>

diff --git a/tests/test-keyfile-utils.c b/tests/test-keyfile-utils.c
index cdf765c49ca51b9c008227226f57d3e2cf85288d..25e86f62a23fa35ae7244a63522db1c8d6e7bb84 100644 (file)
--- a/tests/test-keyfile-utils.c
+++ b/tests/test-keyfile-utils.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include <glib.h>
 #include <stdlib.h>
 #include <gio/gio.h>

diff --git a/tests/test-mutable-tree.c b/tests/test-mutable-tree.c
index b0c23867c1c55a55048562ee0c32d5d0c1c9baa1..771ccabd1be9caced4e76f2c33fbfcb3e04d995c 100644 (file)
--- a/tests/test-mutable-tree.c
+++ b/tests/test-mutable-tree.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "ostree-mutable-tree.h"
 #include <glib.h>
 #include <stdlib.h>

diff --git a/tests/test-ot-tool-util.c b/tests/test-ot-tool-util.c
index 39807da24b4dcef368b4aa7db9fb9da23ec6dbcf..e9b3521394059f469b226d10456fd5e6471be5fe 100644 (file)
--- a/tests/test-ot-tool-util.c
+++ b/tests/test-ot-tool-util.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "ostree-mutable-tree.h"
 #include <glib.h>
 #include <stdlib.h>

diff --git a/tests/test-ot-unix-utils.c b/tests/test-ot-unix-utils.c
index cd167a260b7cca31353493ac2d5b12e5d42c5123..e2125142c6112b66d9b02ad0e21cb0757cd22af2 100644 (file)
--- a/tests/test-ot-unix-utils.c
+++ b/tests/test-ot-unix-utils.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "libgsystem.h"
+#include "libglnx.h"
 #include "ot-unix-utils.h"
 #include <glib.h>
 

diff --git a/tests/test-varint.c b/tests/test-varint.c
index 1dc6ec1389bf6311376e2b2cf456e8ad4dd18b9b..e069fc5736a3d19ffaa349c072ad1caf684e53a4 100644 (file)
--- a/tests/test-varint.c
+++ b/tests/test-varint.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "libgsystem.h"
+#include "libglnx.h"
 
 #include "ostree-varint.h"